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

Bug: 347831320
Merged-In: If4a447f77a10ef974ece262282b7e77b1428e194
Change-Id: I572ed297eb03711b12fdaa6f383bb5ba55db81c9