Merge "Disable dismissing the dream on activity start" into tm-dev am:...

Merge "Disable dismissing the dream on activity start" into tm-dev am: 3abe51bc am: 8c03efe4 am: eb5ee202 am: cc20e368

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



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