Restore "UPSTREAM: PM / wakeup updates"

This reverts commit 45417b13166cf29949e9da42a79708284cfab465.

Change-Id: I70569feda2d2dd2d4449da0957aceaf77aedef6f
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
12 files changed