[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 4d2fd1c090 am: b951ebe193 am: 8b74c7a26b am: 77ead5b8e1 am: 90248a6922 -s ours

am skip reason: Change-Id Ia594d9b0c9252488ed4c01aff107f4f4f54e66db with SHA-1 7b753df20d is in history

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

Change-Id: Ib9f179c0cd8229c778a03ec5d71b21efeea7f7e5
tree: d3ebd80dcffaa956c68a5923a6ee2ad59fb9b79b
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg