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