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

Change-Id: I8428663ed86cc4257b24ad10488d69b89666537d