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

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

Change-Id: I8426e89337e60c48ad20677e835d36622d41ed91