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

Bug: 347831320
Merged-In: I09691aa3cec190a4d190c373aaaf2b8c57c0c90a
Change-Id: I3e456691c8f51ac425262130d2727b6476b167e0