Merge "Update language to comply with Android's inclusive language guidance" am: 0090d82f18 am: c3972b8d97

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

Change-Id: Iefb939a07702b1aecfab75a03decf85ab6b55b50