Merge "Update language to comply with Android's inclusive language guidance" am: 48c50ccdfe am: e34fa22622

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

Change-Id: I0da0bd777346cf53d89be6d4347d3ccef07f9385