Merge "Data call retry refactoring" into mm-wireless-dev
am: 599f62562b

* commit '599f62562b6102f9e3830d5b32a282d23c59e2fd':
  Data call retry refactoring