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

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

Change-Id: Ic4667f9edb88423c88e3286aaa5ae6a12ab41222