Merge changes Iabad7300,I85363e28

* changes:
  Stubbed setOemNetworkPreference in Connectivity
  Update OemNetworkPreferences to use 1:1 Map
tree: 11aad1cf3adc710c6b6f8c33116d046d2ff4b962
  1. framework/
  2. service/
  3. OWNERS