Merge "Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7  -s ours am: 95e10b296e am: c3e2d40309 am: d0c9f402d5" into oc-mr1-dev-plus-aosp am: c3af9af6b2  -s ours"