[TIMOB-17565]: Android - Modify image logic for Android-L + add safety c...

...hecks

Testing steps in JIRA