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

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



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