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