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