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