am a5e44bbd: am 083a50a3: Merge change I66693ea2 into eclair

Merge commit 'a5e44bbd3788bae2b38dfb7771cb021f8541fe1f' into eclair-mr2-plus-aosp

* commit 'a5e44bbd3788bae2b38dfb7771cb021f8541fe1f':
  fix sync exponential backoff for expedited syncs