[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 034a0808 -s ours am: a5babcec -s ours

am skip reason: Change-Id Icfc08862db6fccd67ccfb60dc390d456ec5387e0 with SHA-1 c959c6a4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13121347

Change-Id: Ie3b29529a7426780930005603ccf130f2ab1e615