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

Change-Id: Iafccb0596c104fab9aceb428a082f55b804f02cf