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

Bug: 370570306
Merged-In: I2b2acc84a673e12b49f7a6c9641f287c8f10f3d8
Change-Id: I05159634922a70fb48371b7cab86d8baeeaf115b