Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7  -s ours am: 95e10b296e am: c3e2d40309
am: d0c9f402d5

Change-Id: Id0e718caf1663ff8e7c27a7b39a795dd8d3afc37