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

Bug: 347831320
Merged-In: I552ee1778fe7b324118e61ea465a9c46f4528468
Change-Id: I0ecf3620e86c0b7d6f48f1a6316dba7ccc5bbff9