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