Merge "Update language to comply with Android's inclusive language guidance" am: a005cb30ed am: 3772a5b3fd

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

Change-Id: I2f838a951cec8f6e7af82a0cd08d99d6045f3952