Merge "Read/Write numBssidsPerScan in ParcelableScanResults" into lmp-dev