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