Merge "[Bugfix][API-1374][API-1379][data]Fix sometimes does not retry the PDN activation operation" into GSW3.0-No-Connman