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