Merge "Update language to comply with Android's inclusive language guidance" am: 2bf3785c3b

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

Change-Id: I926ed82a4d21e73b91b590a6fb2e556753c10ef2