[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: cd2896c4e7 -s ours

am skip reason: Merged-In Iedbb9eea589b56e81e044603c958f0b2c4cb3720 with SHA-1 af82c80bda is already in history

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

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