Merge "Cursor-based tests for AlertDialog" into mnc-ub-dev