Merge "Update language to comply with Android's inclusive language guidance" am: ea575e7bc4 am: 0166574738 am: fd6b8e0da4

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

Change-Id: I784c5050682c23e64796689caed846e0952bfed5