Merge "Order awakening from dream after unlocking." into udc-dev am: 52a65957

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



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