Merge "Update language to comply with Android's inclusive language guidance" am: b6488ac518 am: 1f27abf523 am: f2f4e95bac am: 923bd83f83 am: 56849e89bb

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

Change-Id: Ib46fe22e7c27b75d1acd98ac3a638c0722569951