Merge "Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3  -s ours am: 26e84466d3  -s ours am: 9bc160cc3d am: b237ea7cc8 am: 98e46b5bd8" into oc-mr1-dev-plus-aosp am: 262dd19973  -s ours"