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