Merge "Update language to comply with Android’s inclusive language guidance" am: dce2f1c04b

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

Change-Id: I0ed39f8348868e66a0b7e10c569dc61657a2c8aa