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

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

Change-Id: If055ea9f7a1a45cf0f1e82deda99178f88ace2ec