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

Bug: 347831320
Merged-In: I77d9c4ee152ba6554226a04e5a07abb95f4645ea
Change-Id: I1111f0dd4d5786a481c412d7a4559fcb1eef39f2