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

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

Change-Id: I646bd573424c3b6ecec083909b0096750f276da6
tree: 7e79f183238843801ea69ff4331a61bc0e1e3193
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg