Merge "Move OemNetworkPreferences to Connectivity" am: c61a6fc426 am: 37aa459906 am: f2c45c31d3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60a24c0fc878737e120414fe85786faacb425b09
tree: e333f1ec1bb99b5a71657c1e3a5f052197d60363
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS