Revert "fix up sleep / suspend issue again"

This reverts commit 4294292f8f9d41daa91440d30312ab1db633c801.

Change-Id: I79bc7005355a85cb8ee678b13d85f8f782b2f07b
Merge "Revert "fix up sleep / suspend issue again"" into kk_2.7-stable