Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev
am: f2b592726d  -s ours

Change-Id: Idd1243bb1cddc91f34f6e47e9cea88b72cff29d0