Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am: d740b2d0 -s ours am: fe5ce91c Change-Id: If9c65045e4810a08dc0a025ac740c5499547fd7e