Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6
am: ff058a78ec

Change-Id: Id39f2a417d5feb4c1da0836c3df484ced0eb84ef