[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 1e442be16e -s ours am: e2b029539f -s ours am: ecd1b93913 -s ours

am skip reason: Change-Id I189f8b99b6095e5796bc28ffa4447ca21697f0ea with SHA-1 dca0484981 is in history

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

Change-Id: I87cc7c1dbe3458fe4e489fbc4aacf21d71194001