Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution."...

Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902 am: 3be1269c  -s ours am: 0a93f42b am: 8462da77 am: ba55b3be  -s ours am: ef696aa4 am: a35989b0 am: ba4b1cdc" into oc-mr1-dev-plus-aosp
am: 295ce6ea  -s ours

Change-Id: I8cb4d47e5ff6a396f0f7845e7545b6b10e181edb