Merge "Merge 24Q4 into AOSP main" into main am: 99871bf am: 8c82aca

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

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

Author: delphij