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

[automerger skipped] Merge "Order awakening from dream after unlocking." into udc-dev am: 52a65957 am: d3cf5eae am: 1eaa1853 -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: I0b333e948c6a6e7796adc23851b90d0d32fb1084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>