Merge "Update language to comply with Android's inclusive language guidance" am: ae5caa0013 am: 36a22f06b1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618

Change-Id: I8426e89337e60c48ad20677e835d36622d41ed91
tree: 0c1ad35a06629c9077433b8cbcf4e86b9bafb81c
  1. core/
  2. packages/
  3. services/
  4. wifi/