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

Bug: 347831320
Merged-In: Ibf7dda6c4c13d6513e2f08239c95c6b2778a98ec
Change-Id: Ic7c52e1a0b7db76af3857c67f502ba6de97a5825