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