Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ic51e440ebfe679a9b98a84fb454e250588761faa
Change-Id: Ide1b970097eccc16635e1f07abc87e2f6afc6e61