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