Merge changes from topic "defer-until-active"

* changes:
  Add defer-until-active policy to CONNECTIVITY_ACTION.
  Add defer-until-active policy to NETWORK_STATS_CHANGED.