Merge "Update language to comply with Android's inclusive language guidance" am: 01c7e5df26 am: 16e6b1da58

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1377756

Change-Id: Ibba6c47fb9736d7320ca89a991424dc098d2f9f1