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 am: a126d94892  -s ours am: 2435c816d8
am: a62951f28f

Change-Id: I7f52c07986fbcb784b6b6b892b1c83977355c754