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

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

Change-Id: I8a7c4e226ccd6bd97381dcb0a3f3ce53a01172a8