Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I96f429ec3284114868ad220ea308a6920930c065
Change-Id: I8967334343407bc9eab73bb0ade0b939e3aa7873