Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I3793958f0ee36f3befff2e0c9c422c4e6f37c031
Change-Id: I84eaf07ff107db8059f75b3a8c0244e9793e7dc5