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

Bug: 370570306
Merged-In: I0c0a39e3fc03d8df4e9e87cf61fb8e1dafcfc996
Change-Id: I0a719e67f7b9a5fb35b6d7f29a02bf6912946a31