Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I1f864dcabea2810dc2a7fc7c4c247994ba0b94df
Change-Id: Ib25c74aa0ac141de0a807b9931241d69376dc871