Merge "Fix a transition issue when entering a dream." into udc-dev am:...

Merge "Fix a transition issue when entering a dream." into udc-dev am: e0d543fc am: 3532c48e am: 9e46dc1d am: 11e8a2db

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



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