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