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