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

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



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