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