Merge "Update language to comply with Android's inclusive language guidance" am: ecb3b55542 am: 7a95b3e873 am: dceb891d2f am: 23551835b0

Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1779486

Change-Id: I669228bc60c1f8f8642e7395ff04e85f6a9b030e