Merge "Remove @hide usage in DataUsageUtilsTest"