Merge "Update language to comply with Android's inclusive language guidance" am: 558a921d81 am: 927f0f7453 am: 1ff037880a am: 6671acef6e am: 8513ac2afc

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

Change-Id: I78e18d9c1490523aeeac4c720f4588bdacd45d2c