Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4."