Merge "Update language to comply with Android's inclusive language guidance" am: 1d2417fa16 am: 436fe675e1 am: 37be2eefe9

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

Change-Id: I8214acb88567e8818f0730d6c19437c42c351143