Merge "Update language in android.text.format to comply with Android’s inclusive language guidance"