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

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



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