Merge "Added video calling data usage per-uid support"
tree: 569d3e68841a542201873ca90b987e34351e0e53
  1. core/
  2. services/
  3. wifi/