am 1904f9d4: am aa1b0618: am b7710d07: resolved conflicts for 70dd1f77 to lmp-sprout-dev

* commit '1904f9d4':
  Fix NOT_RESTRICTED network capability and enforce it.

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

@@ -944,7 +944,7 @@ public final class DataConnection extends StateMachine {
                     default:
                 }
             }
-            ConnectivityManager.maybeMarkCapabilitiesRestricted(result);
+            result.maybeMarkCapabilitiesRestricted();
         }
         int up = 14;
         int down = 14;