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

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

Change-Id: I3a82e2d9f8d567ab4773fe96903cf5413f9321eb