Merge "Update language to comply with Android's inclusive language guidance" am: b6488ac518 am: 1f27abf523

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

Change-Id: Id5597b0e732c599413b60bc5c3e739a53f3fe720