Merge "Revert "Make DreamActivity no history"" into tm-qpr-dev am: dd326938...

Merge "Revert "Make DreamActivity no history"" into tm-qpr-dev am: dd326938 am: 4a3044d1 am: 69728038

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



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