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

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

Change-Id: Ia983b250273e8f16cb1f3e76b00563633c32e95d