[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: 299e8d17 -s ours am: 1d4f8cb0 -s ours am: 1a11f03a -s ours

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

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



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