Merge "Update language to comply with Android’s inclusive language guidance" am: 5f7d33da75 am: 5bcf151c30

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

Change-Id: Idc9448c78a140962a4eec43cbd6b8358d021ff6e