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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib37a92a20b907faed245cca914b46be9b8c1e7fb