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

Bug: 347831320
Merged-In: Ib3cc0c6ad576e7cda26b7f50cdc61d52e6349c78
Change-Id: I6612e8dbeb7b3f60a24a85ec5af0aacca5e87ecb