Merge "IpManager: add a provisioning timeout option" into nyc-dev

diff --cc services/net/java/android/net/dhcp/DhcpClient.java
Simple merge

diff --cc services/net/java/android/net/ip/IpManager.java
index 16791ed,8ab029c..0444686
--- 1/services/net/java/android/net/ip/IpManager.java
--- 2/services/net/java/android/net/ip/IpManager.java
+++ b/services/net/java/android/net/ip/IpManager.java
@@@ -53,7 -54,12 +54,8 @@@ import java.net.InetAddress
  import java.net.NetworkInterface;
  import java.net.SocketException;
  import java.util.Objects;
+ import java.util.StringJoiner;
  
 -import static android.net.metrics.IpConnectivityEvent.IPCE_IPMGR_PROVISIONING_OK;
 -import static android.net.metrics.IpConnectivityEvent.IPCE_IPMGR_PROVISIONING_FAIL;
 -import static android.net.metrics.IpConnectivityEvent.IPCE_IPMGR_COMPLETE_LIFECYCLE;
 -
  
  /**
   * IpManager