Merge "Update language to comply with Android’s inclusive language guidance." am: 255d5a9270 am: 3e43926852

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

Change-Id: I6a01805d09d82038590887ba333a24fbbf12a2d1