Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I39af4942588c276f7a3d66b2920a17f87d820647
Change-Id: Ic4e3edabcbc38ea255b7755e6514eba46757ba1e