Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f am: 779a1aedd5 am: 9f1608f214 am: c19fd3c4cb

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

Change-Id: I68910f603a604649f08f6e4a189218b04b55d5a1