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

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

Change-Id: I259fb2ecd5ab6936ae7fc1ff4d3c78658d7b2b59