am 7f13d0ed: am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE

* commit '7f13d0ed408c3ddce5b061c4370d99ba15d027b7':
  Preferred network discrepancy after rild is restarted.