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

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

Change-Id: I8cf1f4696e8c4cc138ba38f8c5fee03f9b0e079d