Merge 24Q4 (ab/12406339) into aosp-main-future Bug: 370570306 Merged-In: Iad62846066769e2c7021200b71fd29cc83e77338 Change-Id: Ic5141c4420bbbdd6e7c2279e23b7abbe9ca327fa