Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ie23c0cd85ce0ff9648db47e22e327d603877aba9
Change-Id: I8871c80f7a6f9f37aa87057a0d579ea6240a3022