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