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

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-qpr1-dev am: c199fc3a -s ours am: 0abd45ca -s ours am: b6a02180 -s ours

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

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



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