Merge "Remove users via adb command instead of polling to check if removed." into udc-dev am: 4efefb6ad2 am: 8c1fae5fff

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

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