Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ib6891395b03bb278e0d0f91334a9f56f179a6ef0
Change-Id: Ie3f2975a186ccc8c14af23d58df9cd01c0e2eb89