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

[automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-v2-dev am: 5428b1a1 -s ours am: 32db39c3 -s ours am: 6a2d0d36 -s ours am: 6ea510ab -s ours am: 6533908b -s ours am: d3c7aa8e -s ours

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

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



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