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

Bug: 347831320
Merged-In: I4ddef80d27ceffcf66b3b5db165af78fa4326e58
Change-Id: I06fec964d95902f15909f4ef485411d0a50ea356