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

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

Change-Id: Ida863fbfe5d988c3dc960f7d34c3a93bf315d20e