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