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

Change-Id: I1574e30ff64f6c7a691e8f4e1e4110cb0af9ee81