DO NOT MERGE Backporting potential usb tapjacking precaution.

Bug: 62187985
Test: manual, backport
Change-Id: Ic7a81cf130fc70bc18f6990a662e921eb0d22635
2 files changed