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

Merge "Update language to comply with Android's inclusive language guidance" am: f4c6a534 am: 127c4fc7 am: 42630234 am: 308bbb6a am: d9f6dde0 am: 8c59e9b0

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1379917

Change-Id: Ib72b6f788a58ecda9e9d69091af3f16a305e3def