Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: If13b6d231ba06bab6432eeb3aefb78f4f7d384a3
Change-Id: I40e9292102b5d64aa693346d014c2d33c852feaa