Merge "[Feature][DATA][T8TSK-282] Optimize data call timeout mechanism" into GSW3.0-No-Connman