Merge "[conflict] Merge "Extends waiting condition for wake up transition."...

Merge "[conflict] Merge "Extends waiting condition for wake up transition." into tm-qpr-dev am: b8d50a3f" into tm-qpr-dev-plus-aosp am: 5248a2a0

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



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