[automerger skipped] DO NOT MERGE - Merge Android 13 am: fb6079cf1a -s ours am: 5738e1df34 -s ours

am skip reason: Merged-In I3d9dc14162402c7897688401183347b78ffd4e86 with SHA-1 2b8775ce98 is already in history

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

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