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