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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375131

Change-Id: I31cc434c25112b9c51d0f86820dde555ee71e7bc