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 am: 7c2e560e am: 073e259e

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



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