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

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

Change-Id: If588e35058e59f27eef2218100907fc882fc8971