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

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

Change-Id: I87ef70146b5032409b8d6f87932641fa620add01