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