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