Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future Bug: 347831320 Merged-In: I7841e617e395465c36ac63ad5474bfe53e538690 Change-Id: Ibe5d5c8f5a71d8a1246da60b3e324b5437c3ac17