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

Change-Id: Ie07e84bbb31df780b8366d63bd364368a24b9134