Merge "Update language to comply with Android’s inclusive language guidance" am: 0bb33ab010 am: 27b367fd26 am: 79609bfa75 am: 457aacb7a5 am: 37a86c16ff

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

Change-Id: I4c54f0c9d9ea4e953e959b2c6db455987edab279