Merge "Fix android.text.cts.TextUtilsTest#testRegionMatches"