DO NOT MERGE Backporting potential usb tapjacking precaution.

Bug: 62187985
Test: manual, backport
Change-Id: I02f615624b33c3fb6e2fbb15ce44a0032b6f4387
(cherry picked from commit cc4bec01404ac375fc109448614143293688ce48)
2 files changed