am 9c118c80: Update CID in NeighboringCellInfo

Merge commit '9c118c80fd0a5416051f2a49f515301f2cf3fd6f' into eclair-plus-aosp

* commit '9c118c80fd0a5416051f2a49f515301f2cf3fd6f':
  Update CID in NeighboringCellInfo