Merge "Update language to comply with Android's inclusive language guidance" am: df9c0ce0d6 am: 9d5f5e2a5e

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

Change-Id: I71bc9fc5d79daa5631e67380041d24ef1e907a76