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