Merge "Update language to comply with Android's inclusive language guidance" am: 49d4511e97

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/1384348

Change-Id: I1d09987b6b58fb3cdd46d225716b288d7234980f
tree: 67c11a6c2aabc61ea863f923dbd6377a2342471a
  1. service/
  2. PREUPLOAD.cfg