Merge "Added video calling data usage per-uid support"
am: 36fdb346f2

Change-Id: I3901efbfafcfab7e076b669f0313dce860e97072