Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into...

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b70  -s ours am: d0d0fea3 am: ff058a78 am: c64209fb  -s ours am: 5252746f am: b4913b70 am: 6cd11423 am: 4bdddadc am: be95e1d9  -s ours am: ff5a0512
am: 0392ba5f

Change-Id: I84fe2d446aa887c2934224c772d5b0ab7b570f5b