Merge changes from topic "revert-1927643-mmtel_capability-TQUGHHKONR"

* changes:
  Revert "Added setup/tear down data support"
  Revert "Added a new network capability MMTEL"