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