Merge "Additional tests for AlertDialog" into mnc-ub-dev