Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ic1b43c4e164fb73a9f97b9b3b323810cf4e41384
Change-Id: Ide87d0df1adc9f947ccd3b06e6508da633b4d9ca