Merge "Update language to comply with Android's inclusive language guidance" am: 986e49df72

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

Change-Id: Iefde894b6c5a39f775001d78e1d6909033926b31