Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Idddd5d3e38e2d14bb1becdffbc0649b2f3bb5dae
Change-Id: Ia59c5355c359e1383bb2af60e261c706d19cd4ef