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

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

Change-Id: I28545b3ef78321bc0e4f7240f20da3f819a6e46d