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

Bug: 347831320
Merged-In: I9ae3af899655057a07488fee2e085cd1884fcca0
Change-Id: I6899d6ea16d21fbc9fc0e5a4c38a5c167bcfa9ce