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