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

Bug: 347831320
Merged-In: I668022c2d567a188917754d1482f227dec84dc46
Change-Id: Ib56de31f39e816581046f39ecb00557e0178f79b