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
am: 6d23578d09

Change-Id: Ia55fa862dc46672d4fa6c49a1a2da5c4ad091a06