Merge "Finish DreamActivity on creation if it is obsolete" into tm-dev am:...

Merge "Finish DreamActivity on creation if it is obsolete" into tm-dev am: abfe2878 am: 1e4fdb5a am: 602ce2b8 am: 57b6665b

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



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