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