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