[automerger skipped] Merge 25Q1 (ab/BP1A.250305.020) to AOSP main am: 8612656e21 am: bfad82dbcd -s ours

am skip reason: Merged-In Ia2a0fce2d5a87522c675798896b5ae7184888284 with SHA-1 9cde05ea5a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/pixel/+/31235164

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