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

am skip reason: subject contains skip directive

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

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