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

Change-Id: I05764035a31a1be641f3c2aea4bda9b1770e8aa0