Merge "Update language to comply with Android's inclusive language guidance" am: 09b57ae95f am: 678e3dabaf am: abbbf97c85

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

Change-Id: I3f6144199e5672843ed04b5239e4855017c22fa2