Fix android broken build cause by rudderstack

[enahum]

Release Note

NONE

[mattermod]

Cherry pick is scheduled.

[mattermod]

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Failed to add the RSA host key for IP address '140.82.113.3' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/mattermost-mobile
   200c0b033..6702b87f6  MM-39712-Gekidou-Edit-Profile-WO-Profile_Image -> upstream/MM-39712-Gekidou-Edit-Profile-WO-Profile_Image
   5419758a5..7c2e6198c  gekidou      -> upstream/gekidou
   1c0d0bb1a..3e0ad378f  master       -> upstream/master
   2e71fcc22..39bdb69fd  release-1.48 -> upstream/release-1.48
Fetching origin
Failed to add the RSA host key for IP address '140.82.113.3' to the list of known hosts (/app/.ssh/known_hosts).
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-mobile-#5856-upstream-release-1.48-1638265155
Switched to a new branch 'automated-cherry-pick-of-mattermost-mobile-#5856-upstream-release-1.48-1638265155'
Branch 'automated-cherry-pick-of-mattermost-mobile-#5856-upstream-release-1.48-1638265155' set up to track remote branch 'release-1.48' from 'upstream'.

+++ About to attempt cherry pick of PR #5856 with merge commit 3e0ad378f11bcc0ccccc6090b84a5116a091bb1a.

error: could not apply 3e0ad378f... Fix android broken build cause by rudderstack (#5856)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

+++ Conflicts detected:

UU package-lock.json
UU package.json
Aborting.

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.