Merge "Update language to comply with Android's inclusive language guidance" am: ecb3b55542 am: 7a95b3e873

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

Change-Id: I2b621d8ef2cfad47a9d81c31a4a662500d434359