DO NOT MERGE Backporting potential usb tapjacking precaution.

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