Merge "Revert "Update language to comply with Android's inclusive language guidance"" am: 132f95006e am: 00e74cf509 am: b0880fe6a9 am: 334e5ccdae am: 1a9c5daf66

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

Change-Id: I2a83dbbb9829b0a6f73f911f7c1651fb2d02e15d