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