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

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

Change-Id: I39737e06e9e79c8f8525f3979e5edc7da5e18f61