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

Merge "Revert "Update language to comply with Android's inclusive language guidance"" am: 132f9500 am: 00e74cf5 am: b0880fe6 am: 334e5ccd am: 1a9c5daf

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

Change-Id: I2a83dbbb9829b0a6f73f911f7c1651fb2d02e15d