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

Change-Id: I0777502c7949e71ec8eac63449734742bec1ee2c