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

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

Change-Id: Ic373dc2b37443c42d8b0d22c33cda9ffe4152c22