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

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

Change-Id: I0216dd84202ed2bb46fdb2abf66e36876096449b