Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7 -s ours
am: 95e10b296e
Change-Id: I4cc393a504461b206355dd269c59cd5b38c80f09
This commit is contained in: