Merge "tests: Support passing null to setExpectedException() in compat layer"