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

Change-Id: I8fdcba43f18249ca30843ab780f1cb945c068e37