Merge "Move OemNetworkPreferences to Connectivity" am: 318e4c2aa7 am: 83af07fb12 am: 8ad13e49a0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60a24c0fc878737e120414fe85786faacb425b09
tree: 3b73fe142686dece9993098075a952b479cdb52c
  1. framework/
  2. service/
  3. OWNERS