Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I4a94280ef2ff63b569d43d8cd90de5a8f2058be9
Change-Id: I4b4d96a53d4016dd7c5cf4799cca5dc4d156b6f7