am 4a7d3850: Merge "Prevent corruption of Wifi scan battery stats" into mnc-dr-dev

* commit '4a7d385069e9e1a490d6d2a8427536e1506a5801':
  Prevent corruption of Wifi scan battery stats
tree: 277bb3d54297b6f6708784809689c9dfac93ce64
  1. service/