Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." am: ff93f927e4 -s ours am: c398c0fc8d -s ours
am: f93437d683
Change-Id: Ic77fec13bfac6f94b6297920fc304ad50af2ca8b
This commit is contained in: