[automerger skipped] Merge Android 13 QPR3 am: 7a1c62c5c4 -s ours am: 716d77d450 -s ours am: f602b500a6 -s ours

am skip reason: Merged-In Ia6b3905b3864b3ce3cf73f59cd9bea940903e451 with SHA-1 cd2896c4e7 is already in history

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

Change-Id: I12a29347fb81817204be8ea9133a3d1ea3e493e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>