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

Merge "Merge "Finish DreamActivity on creation if it is obsolete" into tm-dev am: abfe2878 am: 1f9957c7" into tm-d1-dev-plus-aosp am: ff5f757a am: 07a7496b

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



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