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

Bug: 347831320
Merged-In: I67463f764893ca31a82e1f4bdc23f91ee9fad820
Change-Id: I55fad08f23036511f1dbbf4bf50afcd871a53165