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

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

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

Author: delphij