[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 7222d4182f am: d1b6f728cd am: b464445869 am: 43622f3866 am: d2d91275a5 -s ours

am skip reason: Change-Id Id2ccee69818e000357d90b54090c827495658dd6 with SHA-1 9ba1c5160b is in history

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

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