Merge branch 'for-4.20/google' into for-linus

Whisker device specific fixes to hid-google driver