Merge "Update language to comply with Android’s inclusive language guidance" am: 38f8261975 am: 3998cf6ed7 am: 81df627717 am: 107e59dadf

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

Change-Id: I7995e0cbc2bba264158705d6cba1d73774a9e0b6