resolve merge conflicts of fa2715e to nyc-mr1-dev

Change-Id: If0a1e7e70aa33e99f05694a37c2a54c567449507

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

diff --cc services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index e396b77,228c015..6648d1e
--- 1/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
--- 2/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@@ -2043,7 -1988,8 +2043,8 @@@ public class NetworkPolicyManagerServic
                  .sendToTarget();
      }
  
 -    private void setRestrictBackgroundLocked(boolean restrictBackground) {
 -        Slog.d(TAG, "setRestrictBackgroundLocked(): " + restrictBackground);
 +    private void setRestrictBackgroundUL(boolean restrictBackground) {
++        Slog.d(TAG, "setRestrictBackgroundUL(): " + restrictBackground);
          final boolean oldRestrictBackground = mRestrictBackground;
          mRestrictBackground = restrictBackground;
          // Must whitelist foreground apps before turning data saver mode on.