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