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

Bug: 347831320
Merged-In: I5059553cb9b6c02810e9638bfaf29dde9ab6140f
Change-Id: I924cc14ed3c2cee644125b91fa498cf5dc7865f8