Fix NetworkPolicyManagerServiceTest failures.

Also, move it to the same package as NPMS.

Bug: 120183807
Test: atest services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
Change-Id: Ic9b672ff657c54b91067579f7e8767c62a3b4a69
2 files changed