am 5b56b259: Merge "- make rssi poll and wifi scan when associated configurable - fix regression when forgeting network - fix NPE in calculateWifiScore Bug:17564108" into lmp-dev

* commit '5b56b25942679fa7a608691e70d210c1032d9e4b':
  - make rssi poll and wifi scan when associated configurable - fix regression when forgeting network - fix NPE in calculateWifiScore Bug:17564108
tree: ecf52bb59985824cfb28ac68e9dbbad498cb7c75
  1. service/