Merge "NetworkPolicyManagerService: fix deadlock" into oc-dev am: 73edcd7328
am: 1bbe822a5c

Change-Id: I36464a2ce5370579b1b051f2eaa0a5c23de51fc7