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

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-dev am: bcfd8ebd -s ours am: 1ecab6ee -s ours am: abd3331d -s ours am: 85435f92 -s ours

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

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



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