[automerger skipped] Merge "Restrict USB poups while setup is in progress"...

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into udc-dev am: 146afcc2 am: eac7a437 -s ours

am skip reason: Merged-In I7d54534696fd73f3b94c5b4250142eed9341c5d8 with SHA-1 80b67340 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27316786



Change-Id: Ib0feb5d586538d0e98518a5087af3d4312b4dcff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>