Use NetworkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED) instead

of NetworkCapabilities.isMetered() for Mainline

Test: Treehugger; no function change
Bug: 147017757
Change-Id: I9c5b520ba0fad2d788d74f4638a99f6604c58011

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

@@ -194,7 +194,10 @@ public class DcNetworkAgent extends NetworkAgent {
             if (networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
                 // only log metrics for DataConnection with NET_CAPABILITY_INTERNET
                 if (mNetworkCapabilities == null
-                        || networkCapabilities.isMetered() != mNetworkCapabilities.isMetered()) {
+                        || networkCapabilities.hasCapability(
+                                NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
+                                        != mNetworkCapabilities.hasCapability(
+                                                NetworkCapabilities.NET_CAPABILITY_NOT_METERED)) {
                     TelephonyMetrics.getInstance().writeNetworkCapabilitiesChangedEvent(
                             mPhone.getPhoneId(), networkCapabilities);
                 }