Merge "Update language to comply with Android's inclusive language guidance" am: ec88a69b00 am: 2fe4f69ea3

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

Change-Id: If43a1f2c9030915ccadc6f4aaa4d031ce6eae32a