[TIMOB-17174]3_3_XUpgrade Analytics to use the new API.

Detailed test case in [jira](https://jira.appcelerator.org/browse/TIMOB-17174?focusedCommentId=310319&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-310319)

backport of #5834