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