Merge "Update language to comply with Android’s inclusive language guidance" am: aace0e5dad am: 762e462fea am: 4f2eb07963 am: 40851ca83f

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

Change-Id: I41b7bced9aa319ed712cd34afd92a2713a8ce646