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

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

Change-Id: I15b4bc73cadc3a90fe577759b2da6931ab9ea864