Merge "Update language to comply with Android’s inclusive language guidance" am: aace0e5dad

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

Change-Id: I366ebd4bbb21392bdcd9998ce8d160abbcbfe441