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

Change-Id: Ibc39fe483882017cbd47733259bd04eb30b187f3