Merge "Order awakening from dream after unlocking." into udc-dev am: 52a6595733 am: 1f87ff962d

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

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