Merge "Ask netd to swap stats map before reading"
tree: 5525c2ff021e6eb0b5b32e008fdb294fb4a24e64
  1. core/
  2. services/
  3. wifi/