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

Bug: 347831320
Merged-In: Id3aa09b4462b12da114c94e4e771d1948ec6637e
Change-Id: Ib2cbb891201def680c019a35b71ae8b7c1843de2