Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714
am: 9b0a6a3509  -s ours

Change-Id: I8a0b0468b053f31a5e28b335cfdd68d7adf7e4b5