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

Change-Id: Ie38994ab474ba3f8b34d3ad4dac6b6a714eb2899