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

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

Change-Id: Icfe0a3528478b3fa88a8d66b389add76d324e16c