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