Merge "Fix ComparatorTest.testReverseOrder()." into android10-tests-dev