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

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

Change-Id: Ie154dc167b1b858222f6eb7f9c9a6235df272f19