Merge branch 'code_coverage_fix_edge_cases' of https://github.com/opp…

…ia/oppia-android into code_coverage_many_to_one_targets