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