Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I6a8b8451cc79517f2ad952d57106c38384091c6e
Change-Id: I5871e9a6d4f7d994f21650b535afe9f3d3b32199