Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I925ad7f7c2f27f5e19aaaf06d61b14140ffce666
Change-Id: I97b96ad15e4acb7395ea369edfb3489530360cda