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

Change-Id: Ib4ccb0c44187f27c1643b94ceb95a6c46ec18dee