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