Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23249483 Change-Id: Iad877e0d98a647c8c90bb1d440d7c9eb7f922fdc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>