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: I53c4c0449b5dea4922021f2f70dbb0d3140d0c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>