Merge "Update language to comply with Android's inclusive language guidance" am: dd1415bbcd am: 50d99fe7c0 am: 82424fe412 am: f1eb1e4233

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

Change-Id: Id1125d34d14b37d400fce0c2a6228af4474af1d7