[automerger skipped] Merge "Merge "Order awakening from dream after...

[automerger skipped] Merge "Merge "Order awakening from dream after unlocking." into udc-dev am: 52a65957 am: d3cf5eae" into udc-d1-dev-plus-aosp am: 3f29ecfa -s ours

am skip reason: Merged-In I3ba4478e7f26a77ef7d3e3be380e75e7c197edc2 with SHA-1 6d93228c is already in history

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



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