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

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