Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000 am: 0490999da3 am: 4c7276679d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386056

Change-Id: I08b21123944936a874e715c693feecde5b182cb4