am 46644517: am cd38d3c5: am 7f3c9eec: Merge "Read/Write numBssidsPerScan in ParcelableScanResults" into lmp-dev
am 46644517: am cd38d3c5: am 7f3c9eec: Merge "Read/Write numBssidsPerScan in ParcelableScanResults" into lmp-dev

* commit '46644517946d5451f1bc5bbed8bc9ccd36b0cbe5':
  Read/Write numBssidsPerScan in ParcelableScanResults

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base