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

Change-Id: Ia2dff6ee69c4c7f10413aa98ba17ca717cb492d2