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