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