Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future Bug: 347831320 Merged-In: Ie99b94a1ec75e9aa9af9e2720d911e5b750c5562 Change-Id: Ib6f918e4fe1a599d5511c3dc13987656abe9a21a