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

Change-Id: I9522243d4a1fac37b0af16cfc31bf7c54f784107