Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I5ed05d0f5aa4c5e98fbd9b5275f3db39ccb76fed
Change-Id: I039103d5231a77496213df3ede1fa5b1dd259a8d