Merge "Fix NetworkPolicyManagerService deadlock" am: cce157aaee am: 109471deae

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418834

Change-Id: I7947d1528ba1bb8e8b322d40bfe1d6e45b0ed647