Merge "Move OemNetworkPreferences to Connectivity" am: 318e4c2aa7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9adc394b0c203cdb1045f50e83487ea0c2000632
tree: 5c9f71e76d2664a3da45ead432063e62ace7a164
  1. framework/
  2. service/
  3. OWNERS