Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I755d000d2fa39bac5b7ea480baf21d1bf8b5067b
Change-Id: I9b9e1b1e3d612a4e3165e8444a058b7708c7c8af