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