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: 5d337f44

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



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