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

Change-Id: I8bae3bc622f8aba6221579cf1ce238cb43477a9b