Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ie4637b1295975c716f50333ad6635b9694a624b8
Change-Id: Ic42c8b9e19f5a7e40b4c4814ffe1a2d7dbae79e8