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

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



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