[automerger skipped] Merge "Have NetworkPolicyManagerService listen...

[automerger skipped] Merge "Have NetworkPolicyManagerService listen onLinkPropertiesChanged callback" into tm-dev am: 9871c51f -s ours am: cf0704e9 -s ours

am skip reason: Merged-In I49f999efc3fbe0a6a325ec138a3f060c7285e6ad with SHA-1 2e45e16c is already in history

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



Change-Id: I432a22007df728c12dab0f981f9d3ab13ba8b3d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>