Merge "Update language to comply with Android's inclusive language guidance" am: 2f9678b015

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

Change-Id: Id3e8bbcc2d0b58a825a5c3a390b1b80a5b52fdeb