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

Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b59272  -s ours am: dfbaa1fd am: d7ece4da am: 06bd19c1 am: 7b1157a9  -s ours am: bcdb9079 am: 5fda53b2 am: 791d8a5b am: 4dd01948 am: 260ef208  -s ours am: b6ecd1f8 am: f2e1ef22 am: edc549d7" into oc-mr1-dev-plus-aosp
am: d11e1492  -s ours

Change-Id: I8cb827ab0e34ab8538a88f23616dd27aa7bd3ff5