am 6e81a40d: Merge change 26286 into eclair

Merge commit '6e81a40d078269258d75bf22dd00a9dc22f4d0b9' into eclair-plus-aosp

* commit '6e81a40d078269258d75bf22dd00a9dc22f4d0b9':
  Resolve race conditions with disconnect of CDMA data and airplane mode