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: ec1ffad4 am: a1a884f0 am: 34ef99b9

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



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