[automerger skipped] Restrict USB poups while setup is in progress am:...

[automerger skipped] Restrict USB poups while setup is in progress am: 68363246 -s ours am: 4f3d2a6c -s ours am: b85cc1f4 -s ours am: ca00e3e6 -s ours am: 3e8cb37d -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: I0a4fb73cb02c6a182de0c670e81aa3991987c19f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>