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

Bug: 347831320
Merged-In: Icb07acd88138a7519f73d3df9ab323220d99dfe7
Change-Id: If03e889dce38cb33a791535ff902453b95f4add8