Merge "Fix android.text.format.cts.DateUtilsTest."