Merge "Update language to comply with Android's inclusive language guidance" am: 4cb1ece9d1 am: 0fa2ec2c23

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

Change-Id: I9a6266db3231e52a23a26a753f002068daa9d072