[automerger skipped] Merge 25Q1 (ab/12770256) to aosp-main-future am: a075adaf60 -s ours

am skip reason: Merged-In I8af97262cb31e78318d44370f31f5b9890113183 with SHA-1 e39af97aea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/31816451

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