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

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



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