Revert "Enable wait for finish attach application" This reverts commit 5ca85c6f3e295b3f7fcfea66ea14baf53ec20e2b. Reason for revert: b/289688173 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fdb54aa1d5a0a3a9cdccabb24f3c0c817cefa782) Merged-In: Ide8464d0f82a2250581e037e58452938a4c2ac33 Change-Id: Ide8464d0f82a2250581e037e58452938a4c2ac33