Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I5a802415051b8fbbfed64042640b9a57298b4b60
Change-Id: Ied43c5925213661829625273728b397bff8f1a0d