Merge "Prevent waiting if no new activity instance launched" into tm-qpr-dev...

Merge "Prevent waiting if no new activity instance launched" into tm-qpr-dev am: f2a5491f am: 86b9c1b8

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



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