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: 6d52c850 am: 497d2c27 am: fb064ff9

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



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