Merge "Update language to comply with Android's inclusive language guidance" am: 31be55091f

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

Change-Id: I764a06c4226d3ba225c87c61b5096672871ccba2