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

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

Change-Id: I474986ba62b8b0c4ddad8491718aab690a7b2595