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

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

Change-Id: I45ceec1cef94f87c151b3d4f9a0ce12b078db577