[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 49d4511e97 am: 57f700d719 am: 3232bac36d am: f6361bb083 am: ba53f05de9 -s ours

am skip reason: Change-Id Ia2983d9792cc4d2841357222ad8f035baf18d843 with SHA-1 8321bf8e91 is in history

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

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