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

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



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