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

Bug: 347831320
Merged-In: Ia3df4631258f3615057db9f7efe5fa2edd76c6cb
Change-Id: Idc979afacbc07d5b28705a5ccc0b63a5c06454bd