Merge "Move OemNetworkPreferences aidl to connectivity" am: 2e03331755 am: 1762e31642

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91bc4b0463d092f59c3e5d2e59bc4704c336a710