Merge changes from topic "network_policy_for_supporting_merged_wifi" into sc-dev

* changes:
  wifi: Use new API for data usage function
  carrier data usage: Use carrier template as default policy