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

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

Change-Id: I43c312df8751fe6af3473906cc001ccc2e566af5