[automerger skipped] DO NOT MERGE - Merge Android 13 am: cce4b10938 -s ours am: 17e677b83f -s ours

am skip reason: Merged-In I3d9dc14162402c7897688401183347b78ffd4e86 with SHA-1 57778dc0da is already in history

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

Change-Id: Ifd5a6139cee68bc51a8080723fc4c5cf5e8e723f
Signed-off-by: Automerger Merge Worker <[email protected]>