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

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



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