Merge 25Q1 (ab/BP1A.250305.020) to AOSP main am: aaa50d31f0 am: d46ef53539

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

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