Merge "Dismiss dream when activities are started while dreaming." into tm-dev...

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

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



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