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

Bug: 347831320
Merged-In: I2f74b2587b9a273cbc5c966a4bf76d4db23a43ac
Change-Id: Ie77b4d2330788240949f42c3cb1ee75970fb306e