Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I713b5814a42c5f9c650045b4d9d3981adeb9a71d
Change-Id: Ic718d8bfcf082a422cf11fa19c80a632d74d9e51