Merge "Remove wifi/ScanResult.averageRssi method"
tree: 34a2126ee7b03cbc8c442de50e81265e928596c7
  1. framework/