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

Change-Id: Ia19f7708f64129c5ab3fb37c516e00a81b3cfc1b