CHROMIUM: Merge remote-tracking branch 'origin/20.2' into chromeos-iris

BUG=b:161330349
TEST=Verify new JSL devices are recognized

Change-Id: Iab29530deabd9e51e233ac5d5297daccc82c59c9