Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Id0fd8b3336658515c33c745986f14c2023cccd78
Change-Id: I9b8c60d4d53a837444fff24f20c3d7c58e89e0f7