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