Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b59272 -s ours am: dfbaa1fd Change-Id: I3bcc1adb52f00e95ef31dc17fc29b2e0242bc753