Merge "Re-enable NetworkPolicyManagerServiceTest."

import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.rules.MethodRule;

    "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

 * </code></pre>

 */

@Ignore

@RunWith(AndroidJUnit4.class)

@MediumTest

public class NetworkPolicyManagerServiceTest {