am 70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo

Merge commit '70c294b205f7b27308c45bf893270bef6081d39b' into froyo-plus-aosp

* commit '70c294b205f7b27308c45bf893270bef6081d39b':
  Fix OperationScheduler moratorium calculation for clock rollback case.