Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: 2324fda135 am: 2181b56527

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3526294

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