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

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

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

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



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