Merge "Update language to comply with Android's inclusive language guidance" am: 6ec9ae5431

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1384296

Change-Id: I2783f3780ce89d7d6a2850f06bf0c7415a2f4082