Merge "Data call retry refactoring" into mm-wireless-dev