Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8
am: 3be1269c0a  -s ours

Change-Id: I194e18d7ac9ac98010e00db548e8f39bec220fc0