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

Change-Id: I8ecba9c30415679608ab74bc53c381d49c3db8b6