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

Bug: 347831320
Merged-In: Ibb06757cd67d3107e3a7ec96ecda8dbe82bfcc66
Change-Id: Ideb5446ffb3c4a4b8c281a2ef4c5d463bf21d9bf