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