Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours
am: 0a93f42be2
Change-Id: I2da7592547bbd1c3c028eb06360c15baf9a8c13c
This commit is contained in: