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

Bug: 347831320
Merged-In: I2e802819614b547e8bf096a446ed48118a795e27
Change-Id: I8241cd97b325a2cf5163159b1c95fa9bdd27d7f2