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

Bug: 370570306
Merged-In: I9d2505965fdf343468a3eefe228d7e93b13f914b
Change-Id: I6afaa4314b8da70c579eae3d86a575f42d4b4b7e