Merge "Update language to comply with Android's inclusive language guidance" am: a0d65e2267 am: 04bff7f6c8 am: cb3ef0078b am: bec1491f5b

Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1375725

Change-Id: I4453ea831d3c2ef8d1434eacfe46e26521adcde6