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

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

Change-Id: Ib234bb0b71587b1659356f5c271e7420960a902d