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

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

Change-Id: Ibd6faef9b78a240fef148538a2365b14c93eff71