Merge "Move OemNetworkPreferences aidl to connectivity" am: d795b61a56 am: 695e5f6f62

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91bc4b0463d092f59c3e5d2e59bc4704c336a710
tree: 223d9db6f7552e1bff4f7631e9a370da0f6804ba
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS