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

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

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



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