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