Merge "Update language to comply with Android’s inclusive language guidance" am: c61b2279f0

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

Change-Id: Ia443e58c97ae29fa8fb7935fae39948405288b6e