[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 240989f708 -s ours

am skip reason: Merged-In I3ee1409e5073c6ea8da6c200ac8d9f9897d17d8e with SHA-1 9b808b021d is already in history

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

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