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

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

Change-Id: Ib364c43dc446a87ea9f76fccc634d35e90c8042a