DO NOT MERGE Backporting potential usb tapjacking precaution.

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