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