Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I87e15ec968f59acd65e3d4bc80d1bad08704bc53
Change-Id: I9f15b553f1d6abc7442e5fc68192f69b939bca51