Merge "Revert "libsuspend: move to exponential backoff"" into nyc-mr1-dev
am: bfec148834

Change-Id: If248d128e6e07915417f51a646a3d7dc11c20bca