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