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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373056

Change-Id: I85773f31e977e6dd78bc6356fe812d0fbfd4473e