Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: 376c3cd am: 6faa182

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3503637

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

Author: delphij