Merge "Update language to comply with Android's inclusive language guidance" am: 2f9678b015 am: ba422d29e0

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

Change-Id: I38145552ef5364e488946e4cf71d70beaf25217f