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

Change-Id: Ica0ef999bd10ed5f529c1c0913f806180b6a92a4