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