Merge "Update language to comply with Android’s inclusive language guidance." am: 262d80ba06 am: 844fc0e52a am: a42c8fc0c1

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

Change-Id: If4cc44baac9e5cd03022e539c2c848b0be873740