Merge "Revert^2 "Enable wait for finish attach application"" into udc-qpr-dev am: 06f83808

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



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