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

Bug: 347831320
Merged-In: I04dce5c4a3a5ae57d0c3da8e4a924e6e02eb4949
Change-Id: I93d9e61e0946fd9e3c51db9b164ceb89f6bcb7eb