tree 0052edb6c781896b9acda2b283a1bfdc5c76ec4f
parent 8c954c474ff6ee8beefce107cf9f6452f3b31c14
author Beverly <beverlyt@google.com> 1504278897 -0400
committer android-build-team Robot <android-build-team-robot@google.com> 1512087458 +0000

DO NOT MERGE Backporting potential usb tapjacking precaution.

Bug: 62187985
Test: manual, backport
Change-Id: I02f615624b33c3fb6e2fbb15ce44a0032b6f4387
(cherry picked from commit cc4bec01404ac375fc109448614143293688ce48)