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