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

Change-Id: I78599f53f9ea78f02335af4ada360965e6ea78bf