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