Merge "Update language to comply with Android’s inclusive language guidance" am: 9083088018 am: d4b1d127f1 am: 8b7a2346d1 am: 01981df37f

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

Change-Id: Ib2be770fc6e4647f249e894790e68bdb69fea003