Merge "Have NetworkPolicyManagerService listen onLinkPropertiesChanged callback" into tm-dev