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

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

Change-Id: Ia235f0faf642f5752e9c169c3383c37219e735a6