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

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

Change-Id: Ia0c937717d130ea844bab629c744e32201991610