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