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

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

Change-Id: I507e7feae10d28d30e9c5141c1c084aaafa16c76