Merge "Update language to comply with Android's inclusive language guidance" am: 007cc402c1

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

Change-Id: I747191120332756b2e79a0f8be99220f6d361f1f