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