Merge changes Iabad7300,I85363e28

* changes:
  Stubbed setOemNetworkPreference in Connectivity
  Update OemNetworkPreferences to use 1:1 Map
tree: c26baca076195adf20a1964acd0e46fea2f81680
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS