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

Change-Id: I0a068e0eb7e833ad28611cf2be1a8bc18d99830a
tree: 0a834f79aceb8cfb18e4ed8cfcb48845a73ea276
  1. core/
  2. services/
  3. wifi/