Merge "Update language to comply with Android's inclusive language guidance" am: ff48dce3c2 am: f96b7895f9

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

Change-Id: I0efbabdfb4dab680ba5a26a11db4b46094b7fb09