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

Bug: 370570306
Merged-In: Iee49ffd94ac72ef063a8478735232829d06469d8
Change-Id: Ia9d5f80c49bf7187f807fc33e91d3088de512513