Merge "Notify NetworkPolicyManagerService on tethering changes" into nyc-mr1-dev