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

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

Change-Id: Ibfc149582f85734d02c739bd91a4cd90d20ba00d