Merge changes I6512d3f7,I99bca71c

* changes:
  [FUI25] Migrate NetworkPolicyManagerService to use ConnectivityManager
  [FUI24] Use getAllNetworkStateSnapshot in NetworkPolicyManagerService