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: a96df47a

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



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