Merge "Abort queued-sleep transition if display shouldn't sleep anymore" into...

Merge "Abort queued-sleep transition if display shouldn't sleep anymore" into udc-dev am: 99612743

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



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