[TIMOB-17565]: Android - Modify image logic for Android-L + add safety checks
Merge pull request #5990 from hieupham007/timob-17565

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