Merge "Update language to comply with Android's inclusive language guidance" am: 0521eb758a am: 8d384c548c

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

Change-Id: I706670b4342df343b0a4ec49260b3601d37aa95e