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

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

Change-Id: I6afccdaa61db8d1d9f4407e252f22857e578ea9f