Merge "Update language to comply with Android's inclusive language guidance" am: dd1415bbcd am: 50d99fe7c0

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

Change-Id: I5f04dc2f3a2d94c1059aafddda0c2fd1209f675d