Merge "Update language to comply with Android's inclusive language guidance" am: 7ee1f8e6a9

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

Change-Id: I937902b8ce8ab19ac1b277e17191fc4b71a3ce0b