[automerger skipped] Merge "Fix wakeAndUnlock immediately after sleep." into...

[automerger skipped] Merge "Fix wakeAndUnlock immediately after sleep." into tm-dev am: bbc60f74 am: 52f9f20c am: b9da886d am: 4a848249 -s ours

am skip reason: Merged-In I0603d2c1d467c8172764ff23be1c3879b8f2edfe with SHA-1 fa9008bf is already in history

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



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