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