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

Bug: 347831320
Merged-In: Ief292d6191471457a4aea11d9a3766034a855dd0
Change-Id: I7a278ebf2d7bb7f15b6a99ae42efbc09e8b9cb16