Merge "Have NetworkPolicyManagerService listen onLinkPropertiesChanged callback"