Merge 24Q3 (ab/11976889) to aosp-main-future

Bug: 347831320
Merged-In: Idd3360fd629347a35012c43a512feac609dba0ec
Change-Id: I16cf5c783769a0c08c6de055c19916037e35fef0