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