[automerger skipped] Merge Android 12 am: a8ab2b0804 -s ours am: 16e8943b03 -s ours

am skip reason: Merged-In Ic2c3f7fb5d5107f5abaef402f7ed69d6d675e00c with SHA-1 546bf09be0 is already in history

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

Change-Id: I538e6ee65e401b281996886dd90466339b022862