Merge "Restrict USB poups while setup is in progress" into tm-dev am: 2ea770c680

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

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