Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c
am: d54bc6a908  -s ours

Change-Id: Ie91e9f362cc247babdc4cfc8eee7f75b647107c2