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

Change-Id: I8564ca1d5f7c185bd6eedd0ee23adbefa9a421e0