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