Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I3d210caa7b15c24eaf523207e4905b20a2894260
Change-Id: Ic3c8148937e940a0258e790ff89463dae79e992c