Merge "Move OemNetworkPreferences aidl to connectivity"