Merge "Address API review comments for VPN changes." am: bbfee2b427 am: 071c17e277

am: ea7b1b7bb9

Change-Id: I0cc600177432f11c7d7dab39478336ed9b7409d7

diff --cc api/current.txt
index dcaa28b,0cff056..9190a13
mode 100644,100755..100644
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt

diff --cc core/java/android/app/admin/DevicePolicyManager.java
index 9a4e215,e2322f3..9436145
--- 1/core/java/android/app/admin/DevicePolicyManager.java
--- 2/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@@ -112,10 -104,9 +112,11 @@@ import java.security.spec.PKCS8EncodedK
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Collections;
+ import java.util.HashSet;
  import java.util.List;
  import java.util.Set;
 +import java.util.concurrent.CompletableFuture;
 +import java.util.concurrent.ExecutionException;
  import java.util.concurrent.Executor;
  
  /**