Merge "NetworkPolicyManagerService: fix deadlock" into oc-dev