Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Iaae6fffba360059398e5f97d52acffbec6cb942f
Change-Id: Icfaeb4d56fd6524bfbcf2ebb0c953b37eb95ddfa