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