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: 119cb292 am: f248a611

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



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