Revert "mmc: decrease wakelock timeout"

This reverts commit 93bf0702b8e7e3badac7c2cfb16f71ce6ed92da7.
Revert "suspend: shorten time to enter sleep state"

This reverts commit f80ca881421be2ee7ace5a97e18bc7632e899df4.
Sync with CM/mm & upstream mm 3.4.24