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: 080705a5 am: 61e5ccc3

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



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