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

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



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