Merge "Update datausage for DataUsagePreferenceController" into qt-dev
am: 2ace95f386

Change-Id: I09ff46fcb21181976bc96381e9cbc74bf13b6030