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

Bug: 347831320
Merged-In: I33f28fb68f454c9451b7434afe17f9b520c97305
Change-Id: I7d9c902015fc087a28ac04c0826f5175e1d08203