Merge "Dismiss dream when activities are started while dreaming." into tm-dev am: 964c0704c5 am: 20f6f656c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988655 Change-Id: I1043e25969423147e6a8c9c8a22ffbf1aa53d09c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: