Read/Write numBssidsPerScan in ParcelableScanResults

Setting the value has no effect because it was lost in marshalling
across binder interface.

Bug: 16826305
Change-Id: I5b308441608e0b7fc159fc249a16aec3728bac82
diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java
index c5c44b5..e7bcb23 100644
--- a/wifi/java/android/net/wifi/WifiScanner.java
+++ b/wifi/java/android/net/wifi/WifiScanner.java
@@ -100,7 +100,7 @@
      */
     public static class ChannelSpec {
         /**
-         * channel frequency in KHz; for example channel 1 is specified as 2412
+         * channel frequency in MHz; for example channel 1 is specified as 2412
          */
         public int frequency;
         /**
@@ -158,6 +158,7 @@
             dest.writeInt(band);
             dest.writeInt(periodInMs);
             dest.writeInt(reportEvents);
+            dest.writeInt(numBssidsPerScan);
 
             if (channels != null) {
                 dest.writeInt(channels.length);
@@ -181,6 +182,7 @@
                         settings.band = in.readInt();
                         settings.periodInMs = in.readInt();
                         settings.reportEvents = in.readInt();
+                        settings.numBssidsPerScan = in.readInt();
                         int num_channels = in.readInt();
                         settings.channels = new ChannelSpec[num_channels];
                         for (int i = 0; i < num_channels; i++) {