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