Merge "Added video calling data usage per-uid support" am: 9b07c109a0 am: 2c833123a0
am: ad880ae6cd

Change-Id: I214a467d01a7b2ff132eaa3f56bdbdadf837f28e