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

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



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