Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours am: bcdb9079ef
am: 5fda53b294

Change-Id: Idda35731b13787fb00e0c7474eebc5b7d8660251