am 8451c25b: Merge change 26171 into eclair

Merge commit '8451c25b919ecef694d293d6bbd84d08d5fb60be' into eclair-plus-aosp

* commit '8451c25b919ecef694d293d6bbd84d08d5fb60be':
  Fix several CDMA call collision cases