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

Change-Id: I91cb627a007c03660d41b0a01d3de71165373ff1