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

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

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



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