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

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

Change-Id: I1abb993c564ed6fa8c7b76678394736b001006ee