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

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

Change-Id: Ia10debc21d4d65e2e7b7b9e16ab96956a56426c9