Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
am: 89a94b706d  -s ours

Change-Id: Ibe0d0ddfa57cf5c52ff5f70c301c0e1f715e5e36