Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a  -s ours am: 0a93f42be2 am: 8462da779b am: ba55b3bea6  -s ours am: ef696aa47b am: a35989b007
am: 8ee7f6a5b7

Change-Id: I5b4a8f723063001336bbd76dd4ef810b8adca083