tree bbdd6bcd8b560c25baa9fe899d3f4dc0cd9f8444
parent 3674e3d9d85dd748d2e02cb95af425d98406c131
author Beverly <beverlyt@google.com> 1504632792 -0400
committer Beverly Tai <beverlyt@google.com> 1505228362 +0000

DO NOT MERGE Backporting potential usb tapjacking precaution.

Bug: 62187985
Test: manual, backport
Change-Id: I9f1d5c6605d6401f9811aef0db68cbf3e6dba06b