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: 3b526e50

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



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