Merge "Update language to comply with Android's inclusive language guidance" am: cb51202601 am: 6c6e238f23 am: 40bdc0c86f

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

Change-Id: Iad19e0977aab66758c01a3b8448a8f432fa92d89