Merge changes Iafe111bf,Ie9d8e935

* changes:
  update CdmaApnPreferenceController
  Add network selection preferences