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