Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3  -s ours am: 26e84466d3  -s ours am: 9bc160cc3d
am: b237ea7cc8

Change-Id: I04d50fa8ed1d66b706f5a5497543bc6b01aa1d8a