Merge "Update language to comply with Android's inclusive language guidance" am: 653ae188b0 am: 37ee2bdac0

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

Change-Id: I7e4e9efad3742e564be41be610ad7a0e8f633632