Merge "Order awakening from dream after unlocking." into udc-qpr-dev am: 9cf55734

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



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