Merge "Abort queued-sleep transition if display shouldn't sleep anymore" into udc-dev am: 9961274383 am: 9b8179ebe1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23605786 Change-Id: Ifdb9da4df23836e6be68cb0460104e7e3dcf3657 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: