[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: e340f69bcd -s ours am: ed4b2be34d -s ours am: ccb61e86a9 -s ours am: cc53f32e6a -s ours

am skip reason: Change-Id I8695ee884ff9163eab82670e0dd3c711fa37258a with SHA-1 601c931b55 is in history

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

Change-Id: I42eb9f73e7b9a680a97ee4249568e78d821dc446