Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: If459e2d5e31c685b331fbf52273a1f1ea8072b32
Change-Id: I474523c8b1ec605ce7bd0d5752bfc51fcd65da46