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