Merge "Update language to comply with Android's inclusive language guidance" am: 296355cba3 am: a5958c2cba am: 36efe13de9 am: 35d1fb2ad2

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

Change-Id: I3782585c701fc54179021b21c8ab44b052671d03