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

Bug: 347831320
Merged-In: I46302d5af424e666e2f666478afe9adf2b480b65
Change-Id: I90e70b22bcdb31860ef14f74a7df2994b288a1f5