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