[automerger skipped] DO NOT MERGE - Merge Android 13 am: fb6079cf1a -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: I8659642cadfd7316218badd229887e5b8aed715f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>