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