Revert "fix sleep / resume issue"

This reverts commit 90de1e7e82ce32c60db40ed795c4913685e02a0b.

Change-Id: I74e3371650b8b45b2dd1dd58c4f2ab9fd32a7de0
Merge "Revert "fix sleep / resume issue"" into kk_2.7-stable