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

Bug: 370570306
Merged-In: Icdb5cbd27ee427800d9e1c4b04c37f86c806ea73
Change-Id: If3dd0c1cb609337e8841c6907d59827a551fcc7a