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

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

Change-Id: I9ee9a80eb9eb808a9a7d2f46873b158ac1f4f00f