Merge remote-tracking branch 'cros/main' into 'aosp/master'

Bug: 264408280
Test: build
Change-Id: I4e9f98e0d9626117860375732c4b5633c0e646f9