Merge "Update language to comply with Android's inclusive language guidance" am: e803bb122f am: 728932de46

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

Change-Id: I50422f84fddaf05ed8d5d94e1b93690b1eb5e1cd