Merge "Update language to comply with Android's inclusive language guidance" am: 4e6e7d7238 am: 19cb457e94

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

Change-Id: I4711a07ce3df64317c0f8ef562506b91353ab691