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

Bug: 370570306
Merged-In: I1f864dcabea2810dc2a7fc7c4c247994ba0b94df
Change-Id: Ib491fd435926cb5148e6fa66d280b8e61fec0a8b