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