Merge "Handle 5G meteredness in telephony framework"

am: f7d2691e1e

Change-Id: I605c523ba16df57df339f2c68c330299caa4b3b5

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

@@ -199,7 +199,8 @@ public class DataSaverBackend {
         }
 
         @Override
-        public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue) {
+        public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue,
+                long networkTypeMask) {
         }
     };