Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ief7c19248fdd739e17c54335a3c234aa9dd3677e
Change-Id: I36f73b0c83e658d43cdfbf62219703ab28d988b3