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

Change-Id: I6f6cb9cf71ba1584b162d6b18c28c2825323e7be