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