Merge "Update language to comply with Android's inclusive language guidance" am: 70f25d25dc am: 0aa04fb067 am: 7f88c3c13c am: 92a62ab08f

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

Change-Id: I231d00ab22ff361d260550a4e3c069ceefb324bf