[automerger skipped] Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future am: 797caaf -s ours

am skip reason: Merged-In I33574b3ff347264a19e2e0bcfd2236639aad01a5 with SHA-1 6b6d542 is already in history

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

Change-Id: I108610e64210cc85fd3ae053026cffae0245aa86
Signed-off-by: Automerger Merge Worker <[email protected]>

Author: delphij