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