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

Change-Id: I0e451cfd8bf662d959ace4f79b1181d27fce79e1