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

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

Change-Id: Ic4d4a00d3c54e1523af6b6c81af3b017f8565d8f