Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I46302d5af424e666e2f666478afe9adf2b480b65
Change-Id: I852672ce9f2f3fe21a467423fb2e73cc090daef2