TIMOB-16088: Only skip android manifest merge if a custom manifest exists.
Merge pull request #5185 from ayeung/timob-16088

TIMOB-16088: Only skip android manifest merge if a custom manifest exists