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