Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b
am: d7ece4da2c

Change-Id: Icfd3af47bed5a40d23d1a48ecbb654625898ca2f