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

Change-Id: I528ac97ec904ce789b50bde5e8174d81c85d5e1b