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

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

Change-Id: I5b1d2fb0544011d23f93f2390bdb639f0fd5ee77