Merge "Revert "Enable wait for finish attach application"" into udc-dev am: c64fa9fe

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



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