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

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

Change-Id: I252ac1729ace47e8ca4107f8936a925771ae78a5