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

Bug: 347831320
Merged-In: I8aab2ecb53c89facd1ae6d499f0733617bfb505e
Change-Id: I6ca36cc7836e175ef04fe77d8fdaec112e7bbd97