Merge 24Q4 (ab/12406339) into aosp-main-future

Bug: 370570306
Merged-In: I29c17ebeea5fe190221a490ed4388a33ca7bd950
Change-Id: I69cc6656f3578612163c8743853fc33f270e239e