Merge 24Q3 (ab/11976889) to aosp-main-future Bug: 347831320 Merged-In: Id31f5d13a2b11a173887d417029375215eaf6abd Change-Id: I71ef5c6eccaf21251bde3ba2ea83bcc3c2458834