[automerger skipped] Merge Android 13 QPR3 am: ebd12bf697 -s ours am: 062f207abd -s ours am: ffed66c729 -s ours am: dabb27b7c5 -s ours

am skip reason: Merged-In I17ead7fc9e38ca182c9f4409cec0eaff1839794f with SHA-1 ff6e5dc3e8 is already in history

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

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