Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I272674c34ceac737cb3fbdf82a64d8df6a83284f
Change-Id: I8d4ad48a27b81130aeca4a495ee2ab6083c8fec7