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: 1f9957c7 am: 3daba432 am: 952a847e

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



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