DO NOT MERGE Backporting potential usb tapjacking precaution.

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