Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I92f766de7e1ae30aba8ff18323e4efae2261dd04
Change-Id: Id2d86c09d3073a75472e24f084abf7dd9b2896da