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

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



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