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

Bug: 347831320
Merged-In: I17b17b4972c5af4ebdd28cc871303677385a857e
Change-Id: I4a0759e6f806560c166f5b86582737c1bf08ff1c