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

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

Change-Id: I0a54d1b90eb7f0dace467d6fe9743c92e943fa3c