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

Change-Id: I0d0ce4d4a017126cb5f6cab1fbe4da2e8ba37ce9