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

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

Change-Id: I7669e251f127147b765c61a9cba760083c7d43d3