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

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

Change-Id: If60583d39beeb643bffad3f8e86a07e480ec97cd