[automerger skipped] Merge Android 13 QPR1 am: ecc2784328 -s ours am: 80b8030e52 -s ours am: 296b6ad6bb -s ours

am skip reason: Merged-In Ie8c226d9e7d1d0dc481d026ccd454a1db46fb915 with SHA-1 eb1937ebc4 is already in history

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

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