[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 5166e28294 -s ours am: 6ea32678df -s ours

am skip reason: Change-Id Ic197ecf19452f269ca31bb3b3b563dccb0719296 with SHA-1 8c1f99f915 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/display/+/12470129

Change-Id: Ib284c5606c5964206ece4e82b1ff949031be40d9