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

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

Change-Id: If1f6788325a20d96e548d027b34d77968584d0a6