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