DO NOT MERGE Backporting potential usb tapjacking precaution.

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