Merge "Revert "Enable wait for finish attach application"" into udc-qpr-dev am: 132a86cb

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



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