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

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

Change-Id: Iffb60f338d758d18c24320923109f40bf6d941f7