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