Merge "Remove libcore.icu.ICU usage in android.text.format.DateFormat"