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

Bug: 347831320
Merged-In: If2591c5a101418e55b00d9439cb3de9da433be60
Change-Id: I13d69673cdb6968498aede99d5c7624cd3a96c8b