Merge "Update language to comply with Android’s inclusive language guidance" am: 2d678b05c2 am: f0c2a456e1

Original change: https://android-review.googlesource.com/c/platform/cts/+/1373475

Change-Id: I9287044c50769be2f407b31353d73d90e93eed6c