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