Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I02a268f6300cc72204636d037addff0d14c9d85e
Change-Id: I490e6069171fddcd4ba245927de584f5a27787fb