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

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

Change-Id: I3c917ed41f0952c7196c9afb87ac49bdcae61b81