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

Bug: 347831320
Merged-In: Iecb8804965686f8c9a913054c33e93a46c870c94
Change-Id: I45eb052f658df1fb9d53190de1fa0ace396411b4