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

Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf224  -s ours am: 3ca0cc0a  -s ours am: 01ae4459 am: 3d600ede am: d34366e7 am: 9b0a6a35  -s ours am: f1a95220 am: c6ca9254 am: 7fd4bec1 am: b00fd6bb am: 93d9ac25  -s ours am: 1ce0456b am: a9d3b4d8 am: 1fa3f2a9" into oc-mr1-dev-plus-aosp
am: 09ec0dc6  -s ours

Change-Id: I876dac52695c20b472e9ec36f02e309967a483a9