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

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



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