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