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

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