Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ie8571e883132cfaa5a054cdcf4c3a827fa215014
Change-Id: Id0722aad4506a7ac0f9f522895ebfe6a61c1773b