Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ic93c2ea28eed2f5f392cc8fe366ed10eb6dcac6b
Change-Id: Ib980bb8a0e305f03f566391adbaa4a24db4386da