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

Change-Id: I9e4cc6677d3ea0c31584efb0416e1d8716285f68