Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I9d7ccb7183db1f2c8f42399cbf3f0c6581b3da95
Change-Id: Idb646978ef591bcefcbebdc3907e7a2e417f3639