Merge "Update language to comply with Android's inclusive language guidance" am: 2bf3785c3b am: 81aa66c980 am: ee48c9fb0b am: fe9e5f31bc

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

Change-Id: I2afdb555ae44a365a8c45cdd93f1c47c617417a1