Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev
am: 61bc3f3c9b

Change-Id: Iba63e8e9b1c543478c16e49c2f81a8cb32567529