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