[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 2d701e14 -s ours

am skip reason: Merged-In I264e728c49f0500f2f868c3a25b0910d0d527340 with SHA-1 f0b2bf94 is already in history

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



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