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