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