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: 70429b13

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



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