Merge "Enable wait for finish attach application" into udc-qpr-dev am: eaed4f07 am: 4f13257e

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



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