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

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

Change-Id: I9c214240aef121ea5eef6d8acaae6569f4cc6965