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

Bug: 347831320
Merged-In: I636eeec062801eba81cc123787430aaa8eb72f2c
Change-Id: Idd0f720d9d82de032f311dc479a72bf139f8737a