Merge "Disable dismissing the dream on activity start" into tm-dev am: 3abe51bc am: 6d52c850

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



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