resolve merge conflicts of 943187668c44 to oc-dev-plus-aosp

Test: make -j30
Test: runtest -x tests/net/java/com/android/server/ConnectivityServiceTest.java
Test: runtest -x tests/net/java/com/android/server/connectivity/VpnTest.java
Change-Id: Ib87cdb96626cd7625e15bec5e4afab12920405e9

diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge

diff --cc services/core/java/com/android/server/connectivity/Vpn.java
index 9fc2fc7,584994a..248f969
--- 1/services/core/java/com/android/server/connectivity/Vpn.java
--- 2/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@@ -1290,20 -1297,19 +1316,18 @@@ public class Vpn 
                  return;
              }
              final Intent intent = new Intent(Settings.ACTION_VPN_SETTINGS);
-             final PendingIntent configIntent = PendingIntent.getActivityAsUser(
-                     mContext, /* request */ 0, intent,
-                     PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT,
-                     null, user);
+             final PendingIntent configIntent = mSystemServices.pendingIntentGetActivityAsUser(
+                     intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT, user);
 -            final Notification.Builder builder = new Notification.Builder(mContext)
 -                    .setDefaults(0)
 -                    .setSmallIcon(R.drawable.vpn_connected)
 -                    .setContentTitle(mContext.getString(R.string.vpn_lockdown_disconnected))
 -                    .setContentText(mContext.getString(R.string.vpn_lockdown_config))
 -                    .setContentIntent(configIntent)
 -                    .setCategory(Notification.CATEGORY_SYSTEM)
 -                    .setPriority(Notification.PRIORITY_LOW)
 -                    .setVisibility(Notification.VISIBILITY_PUBLIC)
 -                    .setOngoing(true)
 -                    .setColor(mContext.getColor(R.color.system_notification_accent_color));
 +            final Notification.Builder builder =
 +                    new Notification.Builder(mContext, SystemNotificationChannels.VPN)
 +                            .setSmallIcon(R.drawable.vpn_connected)
 +                            .setContentTitle(mContext.getString(R.string.vpn_lockdown_disconnected))
 +                            .setContentText(mContext.getString(R.string.vpn_lockdown_config))
 +                            .setContentIntent(configIntent)
 +                            .setCategory(Notification.CATEGORY_SYSTEM)
 +                            .setVisibility(Notification.VISIBILITY_PUBLIC)
 +                            .setOngoing(true)
 +                            .setColor(mContext.getColor(R.color.system_notification_accent_color));
              notificationManager.notifyAsUser(TAG, 0, builder.build(), user);
          } finally {
              Binder.restoreCallingIdentity(token);