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

Merge "Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c am: 68f91528  -s ours am: 26e84466  -s ours am: 9bc160cc am: b237ea7c" into oc-mr1-dev am: 2dfb1bab" into oc-mr1-dev-plus-aosp
am: a76dc389  -s ours

Change-Id: I101202f9a7cd0e5f4d34096be4f7b4398e9cec55