Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution."...

Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82 am: 97b98a3b am: d54bc6a9  -s ours am: b004901c am: 9a74d618 am: 0bf81b63 am: e148e39d am: a126d948  -s ours am: 2435c816 am: a62951f2 am: 6d23578d" into oc-mr1-dev-plus-aosp