Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future

Bug: 347831320
Merged-In: I5793f3fcbd31221a8c47658ad00629bcbf704bc0
Change-Id: I0ef34251c5b5dbe0d64c0efa41a298ca99a48908