Merge "Update language to comply with Android’s inclusive language guidance" am: 0bb33ab010 am: 27b367fd26 am: 79609bfa75 am: 457aacb7a5

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

Change-Id: I92c6e8f1dcfd9a03d1dd6cea8f4b90761a9fd8d3