Merge "NsdServiceInfo: move test to tests/net" am: 48859e01d5 am: 1b0f4bf606

am: e8c2700519

Change-Id: I44cae417fcddad72c13938b6fb751de6ed784046

core/java/android/net/nsd/NsdServiceInfo.java

@@ -30,7 +30,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Map;
 
-
 /**
  * A class representing service information for network service discovery
  * {@see NsdManager}
@@ -43,7 +42,7 @@ public final class NsdServiceInfo implements Parcelable {
 
     private String mServiceType;
 
-    private final ArrayMap<String, byte[]> mTxtRecord = new ArrayMap<String, byte[]>();
+    private final ArrayMap<String, byte[]> mTxtRecord = new ArrayMap<>();
 
     private InetAddress mHost;