[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am:...

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: cec81e30 -s ours am: b23c8335 -s ours

am skip reason: Change-Id Iafcefc2aa64cf3c50b1d139ec0204a315be29da7 with SHA-1 159de414 is in history

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

Change-Id: Ibe781c52461200cffa1a43174e81a709ff9f2c8b