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

Change-Id: Id5662a7d789e3e17e365d99b439cc8e8ab5d1c37