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

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into tm-dev am: 2ea770c6 am: 6d77b32c -s ours am: 3c9228d2 -s ours am: e84565a7 -s ours am: 902c5c16 -s ours

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

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



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