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