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

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

Change-Id: Ieb38a2506f125763f4df572ffd6e18a9c663f65e