Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b
am: 68f91528c3  -s ours

Change-Id: Ib051065fc2e83bc001d82f18c9150339842f5e21