Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a  -s ours am: 5252746fe0 am: b4913b7093
am: 6cd1142360

Change-Id: I1f5c3e90eb7cc9679d54699d2ead567e4db6c789