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