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

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

Change-Id: I453f4d3d600865773861dcb6e78c51185cd037f9