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