[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am:...

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: bf45599d -s ours am: 69e79704 -s ours am: 3332b737 -s ours

am skip reason: Merged-In I9ac05f5da437030e1b5db082ddaf7959f82acccd with SHA-1 d3f92147 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279041

Change-Id: I3077fe21b6acaffb2ff47b4fb1b10d2bea6b1af9