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