Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" am: 5c0929bd am: ccdd013b am: 8ec897e6 am: 4a2e5f0a

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

Change-Id: Ic9312c101db2f7e1e61a522db4d83f0d0b9783a6