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

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



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