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