Merge "Add NetworkCapabilities#getSSID to SystemApi" am: 385afc999e am: 3a8c533d65

Change-Id: I5d98ddd28ac963615b0a00441b8716f32602fbe8

api/system-current.txt

@@ -4501,6 +4501,7 @@ package android.net {
 
   public final class NetworkCapabilities implements android.os.Parcelable {
     method public boolean deduceRestrictedCapability();
+    method @Nullable public String getSSID();
     method @NonNull public int[] getTransportTypes();
     method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);
     method @NonNull public android.net.NetworkCapabilities setSSID(@Nullable String);

core/java/android/net/NetworkCapabilities.java

@@ -1283,6 +1283,7 @@ public final class NetworkCapabilities implements Parcelable {
      * Gets the SSID of this network, or null if none or unknown.
      * @hide
      */
+    @SystemApi
     public @Nullable String getSSID() {
         return mSSID;
     }