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

Bug: 347831320
Merged-In: I401b9472a8e4204c0b602a12687ee45f2cd47cb0
Change-Id: Ia0a3de20178f0cc5a024307d294fe220f860d3c5