Merge "Merge 25Q1 (ab/12770256) to aosp-main-future" into aosp-main-future am: 8187831

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

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

Author: delphij