Merge "Update language to comply with Android’s inclusive language guidance." am: 255d5a9270

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

Change-Id: I9bd7fef3a277994f8d72fcf08122eac1e6c5d951