Merge "Fix android.text.format.cts.DateUtilsTest#test_getRelativeTimeSpanString" into mnc-dev