Merge "Dismiss dream when activities are started while dreaming." into tm-dev am: 964c0704

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



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