Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
am: d740b2d09a  -s ours

Change-Id: I952391f1801cd678240b145971a733c755f62078