Fix TestDPC build breakage due to API changes

Change-Id: I2518a27611b7e518edd6e52648d4fc187581f8b5

Author: tony-mak

app/src/main/java/com/afwsamples/testdpc/policy/MeteredDataRestrictionInfoAdapter.java

@@ -98,7 +98,7 @@ public void onClick(DialogInterface dialog, int which) {
 
     @TargetApi(28)
     private void setMeteredDataRestrictedPkgs(List<String> pkgNames) {
-        final List<String> excludedPkgs = mDevicePolicyManager.setMeteredDataDisabled(
+        final List<String> excludedPkgs = mDevicePolicyManager.setMeteredDataDisabledPackages(
             DeviceAdminReceiver.getComponentName(mContext), pkgNames);
 
         if (!excludedPkgs.isEmpty()) {

app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

@@ -1274,8 +1274,8 @@ private boolean installKeyPair(final PrivateKey key, final Certificate cert, fin
                                    boolean isUserSelectable) {
         if (BuildCompat.isAtLeastP()) {
             return mDevicePolicyManager.installKeyPair(
-                    mAdminComponentName, key, new Certificate[]{cert}, alias, false,
-                    isUserSelectable);
+                    mAdminComponentName, key, new Certificate[]{cert}, alias,
+                    isUserSelectable ? DevicePolicyManager.INSTALLKEY_SET_USER_SELECTABLE : 0);
         } else {
             if (!isUserSelectable) {
                 throw new IllegalArgumentException(
@@ -2783,7 +2783,7 @@ private void showSetMeteredDataPrompt() {
 
     @TargetApi(28)
     private List<String> getMeteredDataRestrictedPkgs() {
-        return mDevicePolicyManager.getMeteredDataDisabled(mAdminComponentName);
+        return mDevicePolicyManager.getMeteredDataDisabledPackages(mAdminComponentName);
     }
 
     /**