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

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



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