Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ide945625251cfeb521d9249ee0a29d05ec6d1a33
Change-Id: I917d1972dda62b3d9ea77608a48c9c1b05980281