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

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

Change-Id: I4d094ef802fbd57dc0c7e85a44943a444ddf0caf