Merge "Update language to comply with Android's inclusive language guidance" am: 2bf3785c3b am: 81aa66c980 am: ee48c9fb0b

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

Change-Id: I8a7224c620930538500eb0a22f896e76a0d1cd0c