Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I4bae1255764b1687e5db6aec799057ac5612c200
Change-Id: Ie75a157d299822a75259af0d5e741a939c4f7e13