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

Change-Id: I305a3a3ee9c4e2176668d779b152cf830114cb72