Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: If2591c5a101418e55b00d9439cb3de9da433be60
Change-Id: I7f2f878d6b34d3f8cc40cc311ade95c2446df9c4