Merge "Added video calling data usage per-uid support" am: 4a98eb7208 am: 2f74c02826 am: ce10610a9c
am: 47ab7cc247  -s ours

Change-Id: I63e6eac2b46aad6999307833b79bf6032a0721fd
tree: a27ca62f348c704c41c252b2277c80f26e274279
  1. core/
  2. services/
  3. wifi/