Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ic19ff6af1a86f94853e8d2c65012ee247ae25bde
Change-Id: Ib95616d72c02400c6a9e333e5408ea92b4c84d27