Merge "Update language to comply with Android's inclusive language guidance" am: 2bf3785c3b am: 81aa66c980

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

Change-Id: I8279d46549d0df8c403c7fe9f5ba91f4eb11a9c9