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