Merge "Fix wakeAndUnlock immediately after sleep." into tm-dev am: bbc60f74 am: 03fa2b8e

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



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