Merge "5G meteredness for telephony framework"

am: 5ce99e22

Change-Id: I5f516f7ba5b4e0ec24283c4b555d4a5ff9ae2ea6

src/com/android/settings/datausage/DataSaverBackend.java

@@ -23,6 +23,7 @@ import android.content.Context;
 import android.net.INetworkPolicyListener;
 import android.net.NetworkPolicyManager;
 import android.os.RemoteException;
+import android.telephony.SubscriptionPlan;
 import android.util.SparseIntArray;
 
 import com.android.settings.overlay.FeatureFactory;
@@ -199,8 +200,11 @@ public class DataSaverBackend {
         }
 
         @Override
-        public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue,
-                long networkTypeMask) {
+        public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue) {
+        }
+
+        @Override
+        public void onSubscriptionPlansChanged(int subId, SubscriptionPlan[] plans) {
         }
     };