Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev
am: 0bdb7902d8

Change-Id: I67c6ceac68b57b9d2e619a25b5e08721b0385db8