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

Change-Id: I28bb498ea60d1a42d4b557f0b58c7134650bb3dd