Merge "Define NOT_ROAMING network capability." am: 8f380ab29c am: 3fe1ae29cd

am: 69b31d4eb0

Change-Id: I04220ff55fc87dbf8d417a30f15a06a877b412d4

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/java/android/net/NetworkCapabilities.java
Simple merge

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

diff --cc tests/net/java/android/net/NetworkCapabilitiesTest.java
index 7346f9f,e6170cb..cd2d098
--- 1/tests/net/java/android/net/NetworkCapabilitiesTest.java
--- 2/tests/net/java/android/net/NetworkCapabilitiesTest.java
+++ b/tests/net/java/android/net/NetworkCapabilitiesTest.java
@@@ -16,7 -16,9 +16,8 @@@
  
  package android.net;
  
+ import static android.net.NetworkCapabilities.LINK_BANDWIDTH_UNSPECIFIED;
  import static android.net.NetworkCapabilities.NET_CAPABILITY_CBS;
 -import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN;
  import static android.net.NetworkCapabilities.NET_CAPABILITY_EIMS;
  import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
  import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

diff --cc tests/net/java/com/android/server/net/NetworkStatsServiceTest.java
Simple merge