Merge "Update java.util.Locale with Oreo release name"