Merge "Update language to comply with Android's inclusive language guidance" am: 4b69c3c115 am: 9b956d4954

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

Change-Id: I03bb221d860086bb4f621e9e6ff069fe15210f07