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

Change-Id: I02b0df60257429b5f2ed4ce2f0f4ee817abf585c