Merge "Update language to comply with Android’s inclusive language guidance" am: 45171e65be am: 4391d318d1 am: 636b875130

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

Change-Id: I3a9951a102c739e50ed172282b44ddae520a5bb1