Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841

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

Change-Id: I234af0318651866983f9089e50e1edcd3e99b547