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

Change-Id: Ibbfa865f666f174b307fbe7a50ac73030d4a5c01