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