Merge "Update language to comply with Android's inclusive language guidance" am: 7ee1f8e6a9 am: 47eeb27cb1 am: 65707f3c0b am: 0a664e383b

Original change: https://android-review.googlesource.com/c/platform/development/+/1374197

Change-Id: Id87259ae4722a39f1cb44cf4171ddc59b20bce68