Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I3874ee7d7eca14f13fb37d67fff738bcd55372b8
Change-Id: I15ecc7aca4e15974b120bc28a68304201ed0c720