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