Merge 24Q3 (ab/11976889) to aosp-main-future

Bug: 347831320
Merged-In: I2e8533a0dbb751311d7af654bd04207ce0a5aef2
Change-Id: If8bcb192c14640dd27ef1500774fa7cd704c56c0