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

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

Change-Id: I2a32126aae4d315911509b86d44928e6ac8f525b