[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: ff6e5dc3e8 -s ours am: 314cc16ea7 -s ours am: 36fae3cdfc -s ours

am skip reason: Merged-In If274f0e9ad4bb83320d5c207d98bbd00679f3835 with SHA-1 0667ff33b2 is already in history

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

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