Merge 25Q1 (ab/BP1A.250305.020) to AOSP main am: 54fc5ed35d

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

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