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