Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ic71e8c63340d854390c494370e49edd7e7235707
Change-Id: Ic36b43e8ae350bed9b7fa7b109296e8a9cd27889