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

Bug: 347831320
Merged-In: If1eb465c4948baed2aa832ca9cf8a8f41d1eb99c
Change-Id: I002a2191ff9e0d37fc03cd7b1fbe7d4c6d143334