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

Change-Id: I8749dc6fb2ef0081ff1bbd5eef2dfbb01f0c97d2