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

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



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