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

Change-Id: Ib24fadaf19a0f200d0718e2e0aa863de3dd67054