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

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

Change-Id: If9712eb750efcc971d12232daf5048adce10bb82